From 2a9985ecd8108551c38965a57a3428160a46b143 Mon Sep 17 00:00:00 2001 From: Sean Colombo Date: Mon, 26 Sep 2011 18:49:47 +0000 Subject: [PATCH] Followup to r97342 to remove the now-unneeded checks for empty username & to add some spaces ;) --- includes/LogEventsList.php | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php index 08949d849b..2569628768 100644 --- a/includes/LogEventsList.php +++ b/includes/LogEventsList.php @@ -330,7 +330,6 @@ class LogEventsList { * @return String: Formatted HTML list item */ public function logLine( $row ) { - $row->user_name = $this->fixUserName($row->user_name, $row->log_user); $entry = DatabaseLogEntry::newFromRow( $row ); $formatter = LogFormatter::newFromEntry( $entry ); $formatter->setShowUserToolLinks( !( $this->flags & self::NO_EXTRA_USER_LINKS ) ); @@ -718,7 +717,7 @@ class LogEventsList { } /* hook can return false, if we don't want the message to be emitted (Wikia BugId:7093) */ - if (!wfRunHooks('LogEventsListShowLogExtract', array(&$s, $types, $page, $user, $param))) { + if ( !wfRunHooks( 'LogEventsListShowLogExtract', array( &$s, $types, $page, $user, $param ) ) ) { return $pager->getNumRows(); } @@ -756,24 +755,7 @@ class LogEventsList { } return false; } - - /** - * if user_name is empty - use User class to get his name - * @param $user_name string - * @param $user_id integer - * @return string - */ - public function fixUserName($user_name, $user_id) { - if ( empty($user_name) ) { - $oUser = User::newFromID($user_id); - if ( $oUser instanceof User ) { - $user_name = $oUser->getName(); - } - } - - return $user_name; - } -} + } /** * @ingroup Pager @@ -1035,10 +1017,6 @@ class LogPager extends ReverseChronologicalPager { if( $this->getNumRows() > 0 ) { $lb = new LinkBatch; foreach ( $this->mResult as $row ) { - $row->user_name = $this->mLogEventsList->fixUserName($row->user_name, $row->log_user); - if ( empty($row->user_name) ) { - continue; - } $lb->add( $row->log_namespace, $row->log_title ); $lb->addObj( Title::makeTitleSafe( NS_USER, $row->user_name ) ); $lb->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->user_name ) ); -- 2.20.1